bitkeeper revision 1.1159.212.94 (4204a0deFxk8r7Vhks3j_qvRlbZMJQ)

Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk

diff --cc tools/libxc/Makefile
index 6920d1044442beaf1799538713b2014d8017e449,770b40032683c200920a48fc6ac9766a7be94260..7ef744aa9552101e0b0dd2f43eb7ea9d7c136209
--- 1/tools/libxc/Makefile
--- 2/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
@@@ -3,10 -12,8 +12,8 @@@ INSTALL_PROG  = $(INSTALL) -m075
  INSTALL_DATA  = $(INSTALL) -m0644
  INSTALL_DIR   = $(INSTALL) -d -m0755
  
 -MAJOR    = 2.0
 +MAJOR    = 3.0
  MINOR    = 0
- LIB_NAME = libxc
- SONAME   = $(LIB_NAME).so.$(MAJOR)
  
  CC       = gcc
  

diff --cc tools/libxutil/Makefile
index 148492351d9a4875bd4b06d56f3a9634461eaed9,595cd97e83a54e650f5c723e27723a874f15eefb..5c6c37eeef8222212c02ac7145f892f22f0fa713
--- 1/tools/libxutil/Makefile
--- 2/tools/libxutil/Makefile
+++ b/tools/libxutil/Makefile
@@@ -32,14 -41,12 +41,12 @@@ CFLAGS   += -Wall -Werror -O3 -fno-stri
  CFLAGS   += -Wp,-MD,.$(@F).d
  DEPS     = .*.d
  
 -MAJOR    := 2.0
 +MAJOR    := 3.0
  MINOR    := 0
- LIB_NAME := libxutil
- SO_NAME  := $(LIB_NAME).so.$(MAJOR)
- LIB      := $(LIB_NAME).so 
- LIB      += $(LIB_NAME).so.$(MAJOR)
- LIB      += $(LIB_NAME).so.$(MAJOR).$(MINOR)
- LIB      += $(LIB_NAME).a
+ LIB      := libxutil.so 
+ LIB      += libxutil.so.$(MAJOR)
+ LIB      += libxutil.so.$(MAJOR).$(MINOR)
+ LIB      += libxutil.a
  
  all: check-for-zlib
        $(MAKE) $(LIB)